Conflict Catcher Prefs (2.0)